Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #32799: Use correct components for ad-blocking #20137

Merged
merged 1 commit into from
Oct 12, 2023
Merged

Fix #32799: Use correct components for ad-blocking #20137

merged 1 commit into from
Oct 12, 2023

Conversation

cuba
Copy link
Contributor

@cuba cuba commented Sep 13, 2023 •
edited
Loading

Resolves brave/brave-browser#32799

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@cuba cuba requested a review from a team as a code owner September 13, 2023 01:03
@cuba cuba force-pushed the js/32799-use-correct-components-for-adblock branch from 633fec1 to 327f4f6 Compare September 13, 2023 01:08
antonok-edm
antonok-edm reviewed Sep 13, 2023
View reviewed changes
Copy link
Collaborator

@antonok-edm antonok-edm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks alright to me other than one request

components/brave_shields/browser/ad_block_component_installer.cc Show resolved Hide resolved
@cuba cuba force-pushed the js/32799-use-correct-components-for-adblock branch from 327f4f6 to d6b9caa Compare September 13, 2023 02:19
@cuba cuba mentioned this pull request Sep 13, 2023
Closed
25 tasks
@cuba cuba force-pushed the js/32799-use-correct-components-for-adblock branch 7 times, most recently from 40fc7e4 to 3701bc2 Compare September 20, 2023 22:15
antonok-edm
antonok-edm approved these changes Oct 4, 2023
View reviewed changes
Copy link
Collaborator

@antonok-edm antonok-edm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome!

components/brave_shields/browser/ad_block_service.cc Outdated Show resolved Hide resolved
ios/browser/api/brave_shields/adblock_filter_list_catalog_entry.h Show resolved Hide resolved
@cuba cuba force-pushed the js/32799-use-correct-components-for-adblock branch 2 times, most recently from a15018c to ca0df4e Compare October 12, 2023 17:37
@cuba cuba force-pushed the js/32799-use-correct-components-for-adblock branch 3 times, most recently from bc04e0d to 2f359a1 Compare October 12, 2023 19:02
@cuba cuba force-pushed the js/32799-use-correct-components-for-adblock branch from 2f359a1 to 25faf99 Compare October 12, 2023 19:29
@cuba cuba merged commit f082834 into master Oct 12, 2023
15 checks passed
@cuba cuba deleted the js/32799-use-correct-components-for-adblock branch October 12, 2023 21:13
@github-actions github-actions bot added this to the 1.61.x - Nightly milestone Oct 12, 2023
bsclifton pushed a commit that referenced this pull request Oct 21, 2023
@cuba @bsclifton
Fix #32799: Use correct components for ad-blocking (#20137)
8a7704b
@bsclifton bsclifton mentioned this pull request Oct 21, 2023
Merged
7 tasks
bsclifton pushed a commit that referenced this pull request Oct 21, 2023
@cuba @bsclifton
Fix #32799: Use correct components for ad-blocking (#20137)
5725190
@bsclifton bsclifton mentioned this pull request Oct 21, 2023
Merged
7 tasks
@kjozwiak
Copy link
Member

kjozwiak commented Oct 23, 2023 •
edited
Loading

Verification PASSED on Win 11 x64 using the following build(s):

Brave | 1.61.45 Chromium: 118.0.5993.96 (Official Build) nightly (64-bit)
-- | --
Revision | 31c36588a37ea88c2276d901ebd20dbf2344fde3
OS | Windows 11 Version 22H2 (Build 22621.2428)

Using the STR/information outlined via brave/brave-browser#32799 (comment), ensured that ad-blocking was generally working as per the following:

Quick Note: If this regressed general blocking, we would have heard it by now from Nighty users within Brave.

Verification PASSED on Pixel 6 running Android 14 using the following build(s):

Brave | 1.61.46 Chromium: 118.0.5993.96 (Official Build) canary (64-bit)
--- | ---
Revision | af0652fa4009f20be16489fe6666fac382550c74
OS | Android 14; Build/U1B2.230922.006; 34; REL

@kjozwiak kjozwiak mentioned this pull request Oct 23, 2023
Merged
25 tasks
kjozwiak pushed a commit that referenced this pull request Oct 24, 2023
@brave-builds @cuba
Adjusted some adblock components update check interval (uplift to 1.6…
ba8511c 
…0.x) (#20591)

* Fix #32799: Use correct components for ad-blocking (#20137)

* Uplift of #20557 (squashed) to beta

---------

Co-authored-by: Jacob Sikorski <[email protected]>
kjozwiak pushed a commit that referenced this pull request Oct 24, 2023
@brave-builds @cuba
Adjusted some adblock components update check interval (uplift to 1.5…
4781378 
…9.x) (#20592)

* Fix #32799: Use correct components for ad-blocking (#20137)

* Uplift of #20557 (squashed) to release

---------

Co-authored-by: Jacob Sikorski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antonok-edm antonok-edm antonok-edm approved these changes

@Brandon-T Brandon-T Brandon-T approved these changes

Assignees

@cuba cuba

Labels
None yet
Projects
None yet
Milestone
1.61.x - Release
Development

Successfully merging this pull request may close these issues.

[iOS] Use correct components for Adblock services
4 participants
@cuba @kjozwiak @Brandon-T @antonok-edm